bitkeeper revision 1.1159.176.3 (419c7922rQh8G2esWsSBcfh7OMce6A)

Foreign-page cleanups.

diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h b/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h
index 688df84eb9c80515703104bd61f15d52f423d42a..d043bc491d5a4283bdd0dc3e3547ff2e8a9a7e33 100644 (file)
--- a/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h
+++ b/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h
@@ -10,10 +10,7 @@
 #ifndef __ASM_XEN_FOREIGN_PAGE_H__
 #define __ASM_XEN_FOREIGN_PAGE_H__
 
-/*
- * NOTE: PG_foreign must not conflict with any PG_ definition in page-flags.h!!
- */
-#define PG_foreign             25
+#define PG_foreign             PG_arch_1
 
 #define PageForeign(page)      test_bit(PG_foreign, &(page)->flags)
 

diff --git a/linux-2.6.9-xen-sparse/include/linux/gfp.h b/linux-2.6.9-xen-sparse/include/linux/gfp.h
index 0c7098657aac09b0c7a60f7d8be567ca73c95d0b..6b1642d3790d7e67f1f3fccd5671abe72bc84532 100644 (file)
--- a/linux-2.6.9-xen-sparse/include/linux/gfp.h
+++ b/linux-2.6.9-xen-sparse/include/linux/gfp.h
@@ -79,11 +79,7 @@ struct vm_area_struct;
  * immediately bail: the arch-specific function has done all the work.
  */
 #ifndef HAVE_ARCH_FREE_PAGE
-static inline int arch_free_page(struct page *page, int order)
-{
-       /* Generic free_page must do the work. */
-       return 0;
-}
+#define arch_free_page(page, order) 0
 #endif
 
 extern struct page *